Merge "Do not change resources table for overriding apps" into rvc-dev-plus-aosp