Merge changes from topic "am-c26f0ad562254f018dec45fde6f135ec" into...

Merge changes from topic "am-c26f0ad562254f018dec45fde6f135ec" into tm-d1-dev-plus-aosp am: fdb86128 -s ours

am skip reason: Merged-In I44cd1ac0e2f6647e3e9d5c60a535faf716d5ed93 with SHA-1 9ab187f1 is already in history

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



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