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

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

Change-Id: I392f12b5b8007a0b5a6ccb57c3547f9c001cc954