[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-e0844d7b1c6e4448bb8524d03efb5eec" into tm-dev am: 5c59ddbb am: c81ed8c5 -s ours

am skip reason: Merged-In Ie3494d592e7b36629317ba51717b528dab13e0fb with SHA-1 ed1b480e is already in history

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



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