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

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

Change-Id: I4aacbf43a7b658e04c070f7915944e141633038a