Merge "Use RRO for product-specific framework resources" into main am: 2336dd581c am: ee39c2056f

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

Change-Id: Ia79349d3debdf66554e78b1b4df577d5504a8441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>