Merge "Add <staging-public-group> tags to T" into sc-v2-dev-plus-aosp