Merge "Do not change resources table for overriding apps" into rvc-dev-plus-aosp am: 63a28918d5 am: 5aa744a068

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

Change-Id: I728693b60687af355fa63e2882b4dcf2bec6838e