Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into tm-dev am: 610482dc39 am: bdf7a94f8e am: 313aac3cbd

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

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