[automerger skipped] Merge "Introduce new App Ops permission for 3rd-party...

[automerger skipped] Merge "Introduce new App Ops permission for 3rd-party InCallService" am: 9666e059 am: 84838b0a am: b570ddfa -s ours

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

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

Change-Id: I20946a1c35fdb12511bd4acb129d7d5d557e8b45