Merge changes I8097e8e0,I07e1dd05,If5059c6c am: f74535d093

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

Change-Id: Ie516ab523186e75d4af10c257e243f1e945dfd0e