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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I846c9e1a2d5570f84d41d132c5cc10c50ffefe36