Merge changes Ie71caf7b,I45ff708e am: 3850b872 am: 0b730f5e am: 72c84f33...

Merge changes Ie71caf7b,I45ff708e am: 3850b872 am: 0b730f5e am: 72c84f33 am: bef22157 am: bb8f8dc9

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



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