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

Change-Id: I8640c6516eb699f86c4570e23f3af0c92babdb94