Merge changes Iec35c735,Ic3238144 am: bf277f37 am: a9617e26 am: d104656d...

Merge changes Iec35c735,Ic3238144 am: bf277f37 am: a9617e26 am: d104656d am: 91920264 am: 0bb2220d

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



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