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

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

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