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

Change-Id: Ib60e17d1a753688315e1418d3860cc793c5e71c0