[automerger skipped] Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into sc-v2-dev am: f107f9a223 -s ours am: 2ce7c24f54 -s ours am: 9fff461f36 -s ours

am skip reason: subject contains skip directive

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

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