[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 skip reason: subject contains skip directive

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

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