Merge changes Iec35c735,Ic3238144 am: bf277f37fa am: a9617e2626

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

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