Merge changes I49ab063d,I6d2d5013,I203ff502,I7c6f244c,I11248ead, ... am: 5f4b6b4c62 am: a3b1e73465

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d80d36e3e83b7fb16a96a9bf10a8d72b8c5ae47