Merge "Fix biometric context update problem." into udc-dev am: 656f5d51 am: 9fee241b am: 96dcae90 am: 97143481

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



Change-Id: Ibf3d60562de9897088bc4e0d5e2174807f5c90bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>