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

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

Change-Id: I3e635f75f906ac872ee528de20238b536ade0528