Merge changes I7cb2ed2c,I84ffe9e9 am: 310a60d90b

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

Change-Id: I73dcebf99c5106b30813b1fb1c8fbbb413107cc7