[automerger skipped] Merge "UserTypeDetails.dump restrictions for SYSTEM" into...

[automerger skipped] Merge "UserTypeDetails.dump restrictions for SYSTEM" into rvc-dev am: 97d2cb33 am: 813bcabe -s ours

am skip reason: Change-Id I5cf04d20fe9edd748803634ec80336b267695ce6 with SHA-1 3271b591 is in history

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

Change-Id: I43e47e9a72daf0492bebe335e0feef73c5c5585a