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