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

Change-Id: I6d90bb47900be91001e0bcf909ec63e35e9b9b94