tree c4425e165b8ac26554326b620da13a6950b294ef
parent c15b5cc4cda12377fd47386319789101988f838f
parent b570ddfa0582b40611f0d54039f898297581180a
author Shuo Qian <shuoq@google.com> 1604983885 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604983885 +0000

[automerger skipped] Merge "Introduce new App Ops permission for 3rd-party InCallService" am: 9666e05985 am: 84838b0a56 am: b570ddfa05 -s ours

am skip reason: Change-Id Ie0f790aab2edcd52cfdbded2630347b9f8dd4d49 with SHA-1 6147275aa7 is in history

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

Change-Id: I20946a1c35fdb12511bd4acb129d7d5d557e8b45