Merge "Remove usage of TelecomManager.from() hidden API" am: 07235288eb am: 55e2207408
am: 12bfd3082e

Change-Id: I7f65f3bbb777eec8b0a78718daa0545ea0349c4d