tree f42643f5b03199c19886864a2492a67a7689682d
parent 4c7aeaf577c3f133e531917cc5be851d92ddb439
parent 68aed47728931e1d399e84992c8f158703a113ea
author Peter Wang <tpwang@google.com> 1596189323 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596189323 +0000

[automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: 8ba18c0508 am: 4b6112a42c -s ours am: 68aed47728 -s ours

am skip reason: Change-Id I7f3b1f5170e032336d9b39b322c49e2b92573586 with SHA-1 ceba2adbbd is in history

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

Change-Id: Ic15254afce6f13f0553faf9ec98fc16fe9563c81