[automerger skipped] Merge "RESTRICT AUTOMERGE Revert "Revert "RESTRICT...

[automerger skipped] Merge "RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..."" into qt-dev am: 88a76a8c am: 51f0eecf -s ours

am skip reason: subject contains skip directive

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



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