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

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



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