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

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



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