Merge "Unify owners for default permission grant policy." am: bff35de7 am:...

Merge "Unify owners for default permission grant policy." am: bff35de7 am: 74906bb4 am: b78ad5e8 am: a176c9ef

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

Change-Id: Iccd7b03bd4a3e111fca3875fd8950ccaddcdc142