Merge changes I90bb3d16,I38824d04,Ie6f6709d am: 2d87e445d5

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

Change-Id: Ibc09bffa87e9646b31b976b83019ab5a421457bc