Merge changes Iec35c735,Ic3238144 am: bf277f37fa

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

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