Merge changes from topic "am-208ccb4d2c5f4da6ac3d16c684d6bdf5" am: e515bedd...

Merge changes from topic "am-208ccb4d2c5f4da6ac3d16c684d6bdf5" am: e515bedd am: 49bb4d43 am: d86c84db am: ca5a3d0d am: b33de22b

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



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