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

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

Change-Id: I0db734fdd24e75d9d2850d67b1ab5297a64c9d93