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