[automerger skipped] Merge "prevent crash with pin protected user and...

[automerger skipped] Merge "prevent crash with pin protected user and taskview" into tm-qpr-dev am: be175280 -s ours am: 970299f2 -s ours

am skip reason: Merged-In I16904357b28cbf73f19291010427854a45af6adc with SHA-1 a54df39c is already in history

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



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