[automerger skipped] Merge changes from topic "bring-rm-uptodate" am:...

[automerger skipped] Merge changes from topic "bring-rm-uptodate" am: 0f6f28be am: affaf68f am: 47e799e3 -s ours am: 199172b9 -s ours am: c289449c -s ours

am skip reason: Merged-In If0468444741a076321dbf3666628dc89833f2dc9 with SHA-1 a3c96511 is already in history

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



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