Merge "Fix build: remove hwcomposer from device manifest" into android11-gsi