[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: 88662e51 am: c83b45d6 -s ours am: 9890f2a2 -s ours

am skip reason: Merged-In I23c971f671546ac085060add89485cfac6691ca3 with SHA-1 8dc6feae is already in history

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



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