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

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

Change-Id: I8c5ffc74af87c797e2c6d060e9581df8743bb14b