Merge changes from topic "am-7b645f7930384d4a8af3c720a9985c1d" into...

Merge changes from topic "am-7b645f7930384d4a8af3c720a9985c1d" into tm-qpr-dev-plus-aosp am: a2329ed9 -s ours

am skip reason: Merged-In I82acfaf34d7729b10d5ff2caa931b737a83d0638 with SHA-1 e9707b37 is already in history

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



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