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

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



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