[automerger skipped] Merge changes I630138a1,I545e9890,I20223fa1,I9e966951,I9fe167dd am: efd0374e am: a857da89 am: a827a22a -s ours

am skip reason: Change-Id I630138a1ac193848acd4f933bc571a2ceeaa4f6c with SHA-1 ee92b521 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I749f3b8fd3bf045793c40937011521437712a7ca