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

Change-Id: I26b52ec69d769591243c65caaec8066f1744d7a7