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

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

Change-Id: Iccd7b03bd4a3e111fca3875fd8950ccaddcdc142