Merge changes from topic "fix-IFace-enroll" into sc-dev am: de4d1e95 am: e7e8fb97 am: bf3f0ef2

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

Change-Id: Iad6c5aeaea4485f7d2a7e94733780ba5960e7622