Merge "Revert "Fix biometric context update problem."" into udc-qpr-dev am: edb93221

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



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