Merge changes I40fb9bbd,If6ba163b,I46fb480a am: 40954523b4 am: c6a4bd596a am: ecedccb0fe am: 508bb36897 am: b00be11a9a

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

Change-Id: If5bc652c76dca9a3daafe262c2ffd92273368d49