Merge changes from topic "aosp-default-wrapper" am: 0ba11a6bdd

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1526284

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I807d6cbe2d3952f905e5e31c64044e3318b5893f