[automerger skipped] Merge "Fix security vulnerability that creates user with no restrictions when accountOptions are too long." into sc-v2-dev am: 6a4f70d50d am: 7fd06c5b76 am: 88662e5168 am: c83b45d601 -s ours am: 9890f2a2b9 -s ours am: e85d4c7adf -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/+/25891466

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