Merge changes from topic "am-28818c72d54e42ad97c5432dd1e79c80" into...

Merge changes from topic "am-28818c72d54e42ad97c5432dd1e79c80" into tm-d1-dev-plus-aosp am: 62bf7daa -s ours

am skip reason: Merged-In If4931999009b27423adeab3af50238dd6d8c8637 with SHA-1 bdf65ba9 is already in history

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



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