Merge "Merge cherrypicks of [18168004] into sc-platform-release. am: 993e0b0b30" into android12-gsi