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

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

Change-Id: I4e59b4a43228fce0e85ccc5d44dad88e020b52af