tree 2b42bd4fcb30643fe36fd783b1fbed8062a02d29
parent af6aa6ffb7b25658cf44d8db610bb689d1096d8b
parent 791f0884367871f25fabb54334dc318edf46b39e
author Joshua Duong <joshuaduong@google.com> 1620939444 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620939444 +0000

Merge "Use keymasterSwEnforcedUserAuthenticators if keymasterHwEnforcedUserAuthenticators is zero." am: 3b2decbb34 am: bc9360ea4e am: 791f088436

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

Change-Id: Ieea062bd379150daf14406376e2e26b9499832fe