Merge changes from topic "presubmit-am-e0844d7b1c6e4448bb8524d03efb5eec" into tm-dev am: 5c59ddbb

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



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