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

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

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



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