Merge changes Ia8e2451f,I474794e6 am: 9c8c0f2420 am: a2a0264d1a

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

Change-Id: I622a2c08e8b99444222f96f1fdbcdc6573438b7b