Merge changes I0817586a,I2799ac71,I6f9795e1 am: e49e56e3c6 am: 73890f651c

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

Change-Id: I3fc52400838ea038546a8a7c030a3386b614c9f7