Merge "Fix crash opening avatar picker in non-en-US locale." into udc-dev am: 0f3d66a9

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



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