Merge "Instrument CUJ_BIOMETRIC_PROMPT with InteractionJankMonitor" into tm-d1-dev am: 9ecbf3139d am: f0e7087cc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482949 Change-Id: Ib76643e05c35758a7b118a8dceb489b54a564310 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: