[automerger skipped] Merge "[Telephony Mainline] Expose hidden APIs and consts" am: 415143daf5 am: cfffdedc87
am: cead28dcee -s ours
am skip reason: change_id I12b8d338a58c0ffe294137171b8bac7d80a0b776 with SHA1 a2b38c875f is in history

Change-Id: I633ddb21e44bf4b2c5c19c3c3869712f3bf5bd1c