Merge changes I00375414,Idccd758d into sc-dev am: 7a29a3dfe0 am: faffe951c6

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

Change-Id: I1023a62eb30264a737ffb984198829335e9f5ea9