Merge "Updating aliases for Permission related ownership" am: 6ee06fa1ec am: faf0b46228

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

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