[automerger skipped] Merge "Fix security vulnerability that creates user with...

[automerger skipped] Merge "Fix security vulnerability that creates user with no restrictions when accountOptions are too long." into sc-v2-dev am: 6a4f70d5 am: 7fd06c5b am: b7cdf5a3 -s ours am: b87e1d95 -s ours am: 2a95885a -s ours

am skip reason: Merged-In I23c971f671546ac085060add89485cfac6691ca3 with SHA-1 33a90988 is already in history

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



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