Merge "Update userUnlockedWithBiometric on unlock changes" into tm-qpr-dev am: 0fd4fda3

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



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