Merge changes Iec35c735,Ic3238144 am: bf277f37fa am: a9617e2626 am: d104656d11

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

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