Merge "Merge cherrypicks of [18122622, 20123803] into sc-v2-platform-release. am: a57ba775f4" into android12L-gsi