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

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



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