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

[automerger skipped] Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into sc-dev am: 03f0146b am: 1b22f106 -s ours am: bf874a88 -s ours am: b530a90c -s ours am: a89d6929 -s ours

am skip reason: subject contains skip directive

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



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