tree b0f5347079901e59d214276d7a4816b0fe83a4d8
parent 5ba661a139d59f15be796c531ec7f2d85edc3e43
parent 84838b0a562cbf9b1b1a46fcaf00adac4b7002f1
author Shuo Qian <shuoq@google.com> 1604982243 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604982243 +0000

Merge "Introduce new App Ops permission for 3rd-party InCallService" am: 9666e05985 am: 84838b0a56

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

Change-Id: Ibc6de7ee13fde894e793cc1a7ba1fa88e034cb75