Merge changes I6096d12a,I5596f392 am: e261d50a7d am: c4794915e5 am: b314a2523a am: cdb04573b2

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

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