Merge "Merge cherrypicks of [19085839] into sc-platform-release. am: 1547a9eb86" into android12-gsi