Merge "RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate...

Merge "RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..."" into qt-dev am: 88a76a8c

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



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