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