Merge "Fix broken cuj instrumentation of CUJ_LOCKSCREEN_PIN_DISAPPEAR" into tm-dev am: e6ec124ee8 am: 7afa492cf1 am: 93fea96980 am: 4e4effd249
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18527309 Change-Id: I0bf6f1742894e94907f7794bbe131fc7b95d2bc9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: