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