Merge changes I3929bfb6,I4ad6fa07 am: 632056e550 am: bf13fc87b0 am: 996c214bbc

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

Change-Id: Ib1ce48b48cebf085aa5bf847d26d21be38b28cc7