Merge "Move Activity proto from activitymanagerservice.proto to windowmanagerservice.proto"