[automerger skipped] Merge "Mark fingerprint HAL as updatable-via-apex" am:...

[automerger skipped] Merge "Mark fingerprint HAL as updatable-via-apex" am: d8773363 am: 92b8f870 am: 6e35c8fc am: 6b8f8abe am: deb716ef am: ce196293 -s ours

am skip reason: Merged-In I76938ffa99d3c518483c022314b3f18749e18deb with SHA-1 c9b499fd is already in history

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



Change-Id: I845a27ea464a57c9e74b3db7df2d21165e021010
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>