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

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

Change-Id: I84f55ce41e71e961e8d258522af4fc387f7fe2b1