Merge "Revert "Expose hidden resources used in telephony/common"" into rvc-dev am: b5e33cf6 am: 61b5cdc3 am: f0e3357e Change-Id: Ib9ea6467e59089651863e105c950df54e3ec6d8c