Merge "Merge cherrypicks of [19085840] into sc-v2-platform-release. am: 2af2beda0c" into android12L-gsi