Merge "Expose TelephonyManager constants as SystemApi" am: 15720f61d9 am: 14676c2053 am: 86973d1b60

Change-Id: I7ae58e7bbd97420d91c825c92993620495b4ccfa