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

Change-Id: I394bc5a8d7d2463244a87ff7defab39c4fd664d5