Merge changes I6096d12a,I5596f392 am: e261d50a7d am: c4794915e5

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

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