Merge changes from topic "presubmit-am-5a7adaf9fa7342b8b1d97cb90a615848" into...

Merge changes from topic "presubmit-am-5a7adaf9fa7342b8b1d97cb90a615848" into tm-mainline-prod am: 01feaa70

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



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