Merge "Merge cherrypicks of [18281033] into sc-platform-release. am: e02b65ab2c" into android12-gsi