Merge changes from topic "presubmit-am-5b6735a029f240ef8623eff7b8ba9458" into tm-mainline-prod am: 1dba7d63

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

Change-Id: I7c7114d6a9e7cc7eaa0b0ffbcb3fa814172f8d44