Merge "Un-deprecate TelephonyManager SIM access APIs" am: 11f136cc06 am: dbc29cd5d2 am: d40371cbaa

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885962

Change-Id: I413bebe7e2c0d2cef69bf1dcf6754cdb70734816