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

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

Change-Id: I3837bf999d7959ef61bda6fe77a53dc3492c6afd