Merge changes Ia128b79b,Ifbeb6192 am: 2d4c39127a am: 1773331fb7 am: 01f66bfe17

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

Change-Id: Ib775e4306fc23477477866a2faa53eb201b25d67