Merge changes I630138a1,I545e9890,I20223fa1,I9e966951,I9fe167dd am: efd0374e08 am: a857da89d5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51bc0ad941c274c12d1d45ed0a6ee5be6ae97716