Merge "Fix security vulnerability that creates user with no restrictions when accountOptions are too long." into udc-dev am: 992e849d98

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

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