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

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

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



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