[automerger skipped] Merge "Fix security vulnerability that creates user with no restrictions when accountOptions are too long." into udc-dev am: 992e849d98 am: a72513a5ea -s ours am: fd0e6e7421 -s ours

am skip reason: Merged-In I23c971f671546ac085060add89485cfac6691ca3 with SHA-1 79f82b24a1 is already in history

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

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