Merge "Mainline:SimStatusDialogController decouple TelephonyManager hidden APIs" am: 6bba42fb40 am: 27c52d5e76

Change-Id: I12080d93b39b990083f3ac795b7e4ae42ffcbe8d