Merge changes I8c2b3dbf,If089e274 am: 8805faa12a

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

Change-Id: Ic8d7b5a62ca068d4e8a58904b793a5a88400fae1