Merge "Merge cherrypicks of [17649501] into sc-platform-release. am: ef7a31190a" into android12-gsi