Merge changes from topic "am-95940dd28b45460c9c802f3a2e5d9e45" am: 41794b05...

Merge changes from topic "am-95940dd28b45460c9c802f3a2e5d9e45" am: 41794b05 am: 795634ae am: fcd0a6db am: 5b37747a am: ae2f3f16

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



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