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

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

Change-Id: I40ff6f1c34af4a3b01608c6a966aaf3945393f81