Merge changes I3e3cbc53,I2a1828d9 am: 132e839c am: e1c41ed7 am: f7474659

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



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