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

Change-Id: I63885ab7c5c8564a6620f3bb4e413df82a66d1c5