[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L07700000954012806:N11300001253875939" into tm-dev am: f53098af -s ours

am skip reason: Merged-In I14f877de268cb9d1cda5e7e8884871b629d905df with SHA-1 c2f0dbe9 is already in history

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



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