Merge changes Iaab5dfa0,I9c820d22 am: 59ab1eba am: ce8a5e7c am: 5de916de...

Merge changes Iaab5dfa0,I9c820d22 am: 59ab1eba am: ce8a5e7c am: 5de916de am: 6b526aea am: 7fa4f576

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



Change-Id: Ief8acd17b01868d09723a76c91af37231d0e2afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>