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

Change-Id: Ic49428aa0012cbaae293aea7bbcaafb42459e2f8