Merge changes I00375414,Idccd758d into sc-dev am: 7a29a3dfe0 am: eb58d0d078 am: 8e9a48b7fb am: 5b55235bfb

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

Change-Id: I8079503231acb53a6ef46b40b783f6dd32efacb8