Merge "prevent crash with pin protected user and taskview" am: b98b2c84 am:...

Merge "prevent crash with pin protected user and taskview" am: b98b2c84 am: d38aad79 am: 286f21bd

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



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