[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L47600000963081744:N22400001405878786" into udc-qpr-dev am: 03b8dbcf -s ours

am skip reason: Merged-In Id1d0b1b60df40c2474fe3151067152b8e0a261c3 with SHA-1 fe47b006 is already in history

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



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