Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update"...

Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into sc-dev am: 03f0146b

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



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