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

[automerger skipped] Merge "Introduce new App Ops permission for 3rd-party InCallService" into rvc-qpr-dev-plus-aosp am: 848a9c6c -s ours

am skip reason: Change-Id Ie0f790aab2edcd52cfdbded2630347b9f8dd4d49 with SHA-1 334ab546 is in history

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

Change-Id: I2631da001a0acd4cdf6d4a795c24c4aa25486e5b