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