[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: c605985f -s ours am: c1c4da9c -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: I7ad416b9ba49546892d2eb9b0e6e68c98f8bd3ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>