Merge changes I2bb2cb29,Ie52ebe19 am: 991cfb0805

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If876225abf44b69ba31f57df0a93e91c14bef4d0