Merge changes from topic "aosp-default-wrapper" am: 6c1dd66442 am: 14e3969067

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I971746b28abcda6f555696f8453603c983153442