[automerger skipped] Enable biometric virtual sensors separately am: d0071d27 -s ours

am skip reason: Merged-In I71133b40fb57f9c2657df3cbffd3836a256f1432 with SHA-1 f84de6e6 is already in history

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



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