Merge changes I8e77238d,Ic4276571 am: 6eaf18b4 am: 19266fc3 am: fad38ca9...

Merge changes I8e77238d,Ic4276571 am: 6eaf18b4 am: 19266fc3 am: fad38ca9 am: 2793ae98 am: f9661692 am: 436ab3b6

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



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