Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into rvc-dev am: 4d96a79f

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



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