Merge changes from topic "am-714ccad727ee4b7f9f6b9ae3e0ec2edd" am: 566bb681...

Merge changes from topic "am-714ccad727ee4b7f9f6b9ae3e0ec2edd" am: 566bb681 am: 5e1087a1 am: c32be5e0 am: dec7bac1 am: a44b80e9

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



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