Merge changes I848cd79c,I5a7977be,I33f404e1 am: 8df134eede am: 262e8b0372

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

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