[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-5a0b948d00ce412aae687580d83d8e1f" into tm-d1-dev-plus-aosp am: aab87c69 -s ours am: 387da154 -s ours

am skip reason: Merged-In I26fd4fd26914ed2a0b3273f4ae5512a87f9cca2c with SHA-1 3b167a63 is already in history

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



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