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