Merge "Quick affordances crash fix for secondary users." into tm-qpr-dev am: a0c0dd2b

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



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