Merge changes I0817586a,I2799ac71,I6f9795e1 am: e49e56e3c6

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

Change-Id: I8f4049033e324a4808e823cce53fa622ca881853