Merge "Fix AIDL FingerprintEnrollClient not being recognized as an EnrollClient" into sc-v2-dev am: c30b714fc6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16143571

Change-Id: Ie8a6c4421d2361b27e2e82db6095b1074fc1728f