Merge changes I2bb2cb29,Ie52ebe19 am: 991cfb0805 am: cf91618eec

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I945b8b7a4d166351e034eaa6f652b93242e5afe4