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

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

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



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