Merge "Remove usage of Telephonymanager getDefault() hidden API" am: 29146f991b
am: 400c51fa68

Change-Id: I7bf39235ed2a8b947479c791e04365254ad58b8d