Merge "Use RRO for product-specific resources" into main am: 36c65e0a1d am: 1ed971c29b

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

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