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

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

Change-Id: I1e1af50189a26441139b212ad9211b5d6b0357d5