Merge "Merge "Revert "Expose hidden resources used in telephony/common"" into...

Merge "Merge "Revert "Expose hidden resources used in telephony/common"" into rvc-dev am: b5e33cf6 am: a021f250" into rvc-d1-dev-plus-aosp am: 64e0b45d am: 1818febe

Change-Id: I94eeab6283a749305d00d331261c46af42572a15