[automerger skipped] Merge changes Iecc0c938,Ib687b661 into udc-qpr-dev am: b05d17e2 -s ours

am skip reason: Merged-In Iecc0c9388c6596cf5a25918f8f0af0495b2133a6 with SHA-1 9e60e635 is already in history

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



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