[automerger skipped] Fix security vulnerability that creates user with no restrictions when accountOptions are too long. am: 79f82b24a1 -s ours

am skip reason: Merged-In I23c971f671546ac085060add89485cfac6691ca3 with SHA-1 7e91582908 is already in history

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

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