[automerger skipped] Use most recent available HAL methods. am: 571542b4be am: fc09a73a4a am: 3dd62c2f33 am: 97db42eb01 -s ours

am skip reason: Merged-In I7db1747550493a634290a968e3f5bbada66f322f with SHA-1 31f6fab3cc is already in history

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

Change-Id: Icb988ecc18a44daf0c825d7ff9eb6233c4798d28