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

Change-Id: I2b68f7f210a758a3e20e0373ddd03ed09cfec7de