Merge "Fix security vulnerability that creates user with no restrictions when...

Merge "Fix security vulnerability that creates user with no restrictions when accountOptions are too long." into sc-v2-dev am: 6a4f70d5 am: 7fd06c5b

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



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