[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: 2125a762 -s ours

am skip reason: subject contains skip directive

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



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