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

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



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