Merge changes Ia7b57ed5,I7e37a289,I1149f37f am: fc03254cb1 am: 91a925fba6 am: 7e3947523a am: 67f79da09f

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

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