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

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

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



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