[automerger skipped] Merge "Rename references to Permission5" into udc-dev am: fa54102d32 am: f597d26133 -s ours
am skip reason: Merged-In Ie6ae689e0f01eb8a1782f5320e4e27e1e87d8a90 with SHA-1 f71cdbae9e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21486485
Change-Id: I4d6c40a3eaf000ccb99781a9d9d6ace9d6c4f689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: