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

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

Change-Id: I80959987bd2e851df3746ccd85291b26b89fd47a