Merge "Merge cherrypicks of [17591709, 18766114] into sc-platform-release. am: 8455185d1c" into android12-gsi