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

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

Change-Id: I51f66b5bbe5c7af178541d6a86dfaec02a0c5973