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

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

Change-Id: I891196fe6bafad3c2cdb53b1fe58bcf552224cb3