[automerger skipped] Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into qt-dev am: 2d9de7b6ef am: 19a62f65cb -s ours am: 18ab349ff5 -s ours am: 5cd1e01215 -s ours am: 3f6e0cb4fe -s ours am: 1060177f55 -s ours am: 0bccaaedcf -s ours am: e70050c788 -s ours

am skip reason: subject contains skip directive

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

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