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

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

Change-Id: I835c98cbed1be7f90d0c57b25d16cf0bda36b3b1