Merge "Merge branch android12-platform-release" into android12-gsi