Merge "Add latency instrumentation for face and fingerprint unlock" into tm-dev am: 992d9aae am: e7e65c76

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17055966

Change-Id: I0edcc5b0b68f11a05277f721abd7b41207ee5cff