[automerger skipped] Merge "Add New TelephonyManager APIs" am: b65aca27af am: 624ccc3331
am: f5a303b09e  -s ours

Change-Id: Ia4b90c07101413b7e876bba790b8b8d39672c0bc