Merge changes Id389ff64,I51598ae1 am: 8c2ebfed4e

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

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