Merge "Updating aliases for Permission related ownership" am: 6ee06fa1 am:...

Merge "Updating aliases for Permission related ownership" am: 6ee06fa1 am: faf0b462 am: 786e95f9 am: a23b523c am: 42cbab99

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



Change-Id: I86b5ce26ac7e23d2aea89add06b3d64c39d6f9f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>