Merge "Merge cherrypicks of [17615050] into sc-platform-release. am: 5a65892c4e" into android12-gsi