Merge changes from topic "c2_sync" into sc-dev am: 398fed37 am: f746f974

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

Change-Id: I6474d1afeeafbb68d3d120af6965634b2c529006