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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id69c475e406961ba7d6d997e7151df3e147ad517