Merge changes I426dc1f7,I7502f09f am: ec895dd834 am: 3879f37c8e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39275b4a1f1a002f3c46509a9c6d3ceded1caa38