Merge changes I90bb3d16,I38824d04,Ie6f6709d am: 2d87e445d5 am: 4ec440d3eb

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

Change-Id: Iea3c078c77f7500901e3f503139d8705f5325e7d