tree 65512397090db894093c699639b4fe00addb2850
parent bb269bc6e41563d231f892068d6192c51448c2e0
parent dbc29cd5d218571d1764965f567e22ec37934622
author Rambo Wang <rambowang@google.com> 1638573628 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638573628 +0000

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