Merge "Adding res id to user switcher item" into tm-qpr-dev am: d504771e am: 5157422e

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



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