[automerger skipped] Merge changes...

[automerger skipped] Merge changes Iddb1bff9,I5bf8da2f,I62a422d9,If68c995d,If1f34679, ... into udc-qpr-dev am: e2194e22 -s ours

am skip reason: Merged-In Iddb1bff9f11bc867aba61897ea2f8b9bc3c27544 with SHA-1 9d16a6ac is already in history

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



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