Merge changes I73de0e8e,Id1d5968e,I45750c75 am: f6bcf1b2d8

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

Change-Id: I45e145ac6489eb8027c9560f44c7ccb8c5a737b9