Merge "[Telephony Mainline] Expose hidden APIs and consts"
am: 9ff4231f47

Change-Id: I679127ed109fa3f4635cbe78cc4d71962419ad92