Merge "Remove usages of hidden resources in Telephony" am: 304780cf26 am: 21bca5cdcb am: 6f82a0d7c7

Change-Id: Iac1dd0708c6d0f57a3b99a652a62d0a8e1eea44e