Merge changes from topic "fix-IFace-enroll" into sc-dev am: de4d1e954f

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15353380

Change-Id: I22462eacbb083ca7b0ba1fd4635c832e07cf8a6b