[automerger skipped] Merge changes from topic "aosp_trunk_stable_cp" into...

[automerger skipped] Merge changes from topic "aosp_trunk_stable_cp" into udc-dev-plus-aosp am: 4d6b5001 am: 2de00a18 am: 4dfbd901 -s ours

am skip reason: Merged-In I843a24308a1653bff0b4842ff71e657304bea2c8 with SHA-1 57c009e4 is already in history

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



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