[automerger skipped] Merge "Fix security vulnerability that creates user with no restrictions when accountOptions are too long." into udc-qpr-dev am: 7d185c82a4 -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: Icf7dc5d69522e1ef9942e57743f0a00dbc9d7657
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>