[automerger skipped] Merge "Do not change resources table for overriding apps"...

[automerger skipped] Merge "Do not change resources table for overriding apps" into mainline-prod am: f5759da7 -s ours

am skip reason: Change-Id Ic7a5a9d8e3ffb60d0b9d4f4fda07946c64179e45 with SHA-1 8fe67449 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12865666

Change-Id: Ibf68beb8e58f3ce98056de8fb1f29f603d56a9e8