[automerger skipped] prevent crash with pin protected user and taskview am: fa4038fb -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: I0b103e03d43e573f9537cfc1292858e755147afd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>