tree 758a12dfb57bca01f94b5530deb298e4fb6bed2a
parent d065a0a4e62cf6547c47978c5e8d2e45bbd4d986
parent 617ea903408edd30b905fb187e171ae1364afc57
author Peter Wang <tpwang@google.com> 1596186283 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596186283 +0000

Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: 617ea90340

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

Change-Id: I43a19b479d4c77bb19af31381e7d998527bc068a