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

Change-Id: Ia3b8c76f3621ab2c1edd7da60b1f5e5ae4e9397f