Merge changes I64d6c526,I3e8cfcdc am: 25f406f912

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

Change-Id: Ibfb16bfb873763a0e36542a29cb960aa5b81d330