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

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

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