Merge "Merge cherrypicks of [17008939] into sc-platform-release. am: 6498b5bfd5" into android12-gsi