Merge changes from topic "remove-biometrics-aidl-cookie" into sc-dev am: def991640c

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

Change-Id: Ia3826ff996cce92d632274c4a9b6aca3dae49491