[automerger skipped] Merge changes from topic "cp-aosp-2647304" into...

[automerger skipped] Merge changes from topic "cp-aosp-2647304" into udc-qpr-dev am: 681e98a0 -s ours

am skip reason: Merged-In I3615a7ca99cb4f1e149dcbfbc912f2ed58fb033f with SHA-1 49712b56 is already in history

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



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