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

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

Change-Id: Ifb3dff8ca3287a36cf5d639969fc6b27076c1a7a