[automerger skipped] Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into rvc-dev am: 4d96a79f54 am: 7ba3486814 -s ours am: d5b99bce20 -s ours am: 2bf25eca1d -s ours am: 91a19dabb3 -s ours am: b88f2c1446 -s ours am: 329d387b4b -s ours am: b748cc3947 -s ours am: 1ee3b09364 -s ours

am skip reason: subject contains skip directive

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

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