Merge "Fix biometric context update problem." into udc-dev am: 656f5d51 am: 65012b15 am: d3480368 am: b4505062

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



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