Merge changes from topic "presubmit-am-e0844d7b1c6e4448bb8524d03efb5eec" into...

Merge changes from topic "presubmit-am-e0844d7b1c6e4448bb8524d03efb5eec" into tm-dev am: 5c59ddbb am: 546f0285 am: 385c0459

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



Change-Id: I66a940a09e495ee66609ca3762ced83b9331482c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>