Merge "[Telephony Mainline] Expose hidden APIs and consts"
am: 415143daf5

Change-Id: I9ca296531fe272c6220c59fa2660205cb83e6c7a