Merge changes from topic "presubmit-am-1968bf8f71954f38a84d46624aadda71" into tm-mainline-prod am: 35efa8ec

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

Change-Id: I39692ac614ca74696df61375dab78c18c3d1be3a