Merge changes I651202ac,I939e2d9f am: 08c712e6af am: 7b815fc750

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

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