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

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

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