[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "presubmit-am-4fee2b7578f94a34b28ec502594c100c", "presubmit-am-e0c94944d7344b3d975421d4c0812104", "presubmit-am-e106eae8e71e41a6a6d95a2472dd22fe" into sc-v2-dev-plus-aosp am: 7f5d9019 -s ours

am skip reason: Merged-In I3ce672aa1a7a39c256dd1396658859c205b61399 with SHA-1 a662140c is already in history

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

Change-Id: Ia0cefcd05c4ff26e7a2a77df3c796435e74ba919