Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into tm-dev am: 610482dc am: bdf7a94f

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



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