Merge changes I8097e8e0,I07e1dd05,If5059c6c am: f74535d093 am: 0d63063805 am: 949a6b6f3e am: 254277a82a am: 3226514080

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

Change-Id: I7bc50dad8c523bde1cb99c22b94d178546461f65