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

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



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