[automerger skipped] Merge "RESTRICT AUTOMERGE Validate permission tree size...

[automerger skipped] Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into tm-dev am: 610482dc am: bdf7a94f am: 313aac3c am: 371a6e5e -s ours

am skip reason: subject contains skip directive

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



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