Merge changes from topic "presubmit-am-8b6dfaa3bb7b442692d25e9419636880" am: 1eef6dbb39

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

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