Merge "Use string resources for avatar picker button labels." into tm-dev am:...

Merge "Use string resources for avatar picker button labels." into tm-dev am: acb98ac1 am: 06fb6441

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

Change-Id: Id480c162c5b21c94fd67cf54ceffa0570d72ea46