Merge "Add CTS test for new TelephonyManager API" am: 1d4f4e4120 am: b319640fc2 am: 730d5cfcf7

Change-Id: I1e755a966b08294b3c9751fb99295b33992530ea