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

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



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