Merge "[ToA] Implement grammatical gender in ActivityTaskManagerService and WindowProcessController" into main