[automerger skipped] Merge changes from topic "cherrypicker-L36300030001460179:N75000030022755462" into udc-mainline-prod am: 3b8a1a2ac9 -s ours

am skip reason: Merged-In Ie888bc81bd8b91040aa308b9b0d2be4a6137e483 with SHA-1 31f1ad2409 is already in history

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

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