[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "cherrypicker-L37600000955090666:N36200001273131748", "cherrypicker-L79000000955070414:N24400001272804687" into tm-dev am: f51f239b am: c4b0ed31 -s ours am: 33575451 -s ours am: bb96e70d -s ours

am skip reason: Merged-In Idb83c6e6e416665405fbe498dce8d56a3cdf857c with SHA-1 d9f9844a is already in history

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



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