Merge changes from topic "aosp-default-wrapper" am: dbb1258329

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d8752d7ae3e70f93040565252222eb5ad5551be