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: 606a92ef am: 2115c8ad

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



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