Merge "Fix broken cuj instrumentation of CUJ_LOCKSCREEN_PIN_DISAPPEAR" into...

Merge "Fix broken cuj instrumentation of CUJ_LOCKSCREEN_PIN_DISAPPEAR" into tm-dev am: e6ec124e am: 7afa492c

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



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