Merge "Unify owners for default permission grant policy." am: bff35de778 am: 74906bb45b am: b78ad5e8db

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

Change-Id: I2471da20f985fb7ee4dc0d5fb50112c3311afff5