[automerger skipped] Fix security vulnerability that creates user with no restrictions when accountOptions are too long. am: 944ea959ab am: f202c2f228 -s ours am: fcf937ad97 -s ours am: 365b1a17ec -s ours am: a0ddae38f5 -s ours am: b13152310f -s ours

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

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

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