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