Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into tm-dev am: 610482dc

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



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