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

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

Change-Id: Ie89d1048bbef95f805c1ca446fa98d406bd06f29