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

[automerger skipped] RESTRICT AUTOMERGE Revert "Revert "RESTRICT AUTOMERGE Validate permission tree size..." am: 4e83e59b am: 4734edc4 -s ours am: 33e8d3d7 -s ours am: 3b64b27a -s ours am: 1b7f3fbc -s ours am: ebfb6f4e -s ours

am skip reason: subject contains skip directive

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



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