Merge "Use RRO for product-specific resources" into main am: 091c832fcf

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/2950245

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