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

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



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