Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into qt-dev am: 2d9de7b6ef

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

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