Merge "[automerger skipped] Merge "Backporting the change of ag/15629060 to...

Merge "[automerger skipped] Merge "Backporting the change of ag/15629060 to rvc-dev" into rvc-dev am: 964ddbbb am: f04c496b am: d90941ca am: 581ed870 -s ours am: 09026442 -s ours" into sc-v2-dev-plus-aosp