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

[automerger skipped] Fix security vulnerability that creates user with no restrictions when accountOptions are too long. am: 944ea959 am: f202c2f2 -s ours am: fcf937ad -s ours am: 365b1a17 -s ours am: a0ddae38 -s ours am: b1315231 -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/+/26135753



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