Merge "Use RRO for product-specific resources" into main am: 08287f41b7 am: f22dd8d18b

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2949649

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