Merge changes from topic "presubmit-am-dde0f469f5904ac491c4239e7c36c203" into tm-mainline-prod am: 0f283b48

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

Change-Id: Ie19e2250dd4b423eb6999889f43729089fb4a090