Merge "Define CUJ_BIOMETRIC_PROMPT in InteractionJankMonitor" into tm-dev am: 92b26992b7 am: 72dceda51c am: 0b357c9aca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18367870 Change-Id: Id0dc49405d1718233d2fbe0b672463d2810ee306 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: