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 am: 189d4f92 am: 80bd28fd

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



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