[automerger skipped] Merge "Rename references to Permission5" into udc-dev am:...

[automerger skipped] Merge "Rename references to Permission5" into udc-dev am: fa54102d am: 993d5b67 -s ours

am skip reason: Merged-In Ie6ae689e0f01eb8a1782f5320e4e27e1e87d8a90 with SHA-1 609a01d7 is already in history

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



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