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

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

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