[automerger skipped] Merge changes from topic "aosp-default-wrapper" am: 6c1dd66442 am: 14e3969067 am: 01d8352de2 -s ours

am skip reason: Change-Id Id5e36e7a42e2600ab69612819f8260110871c711 with SHA-1 8e85d1f5a5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64242dee604d72765fe1364dad851611123c0042