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

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

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



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