Merge "Merge cherrypicks of [20084105] into sc-platform-release. am: 1bcda24420" into android12-gsi