[automerger skipped] Merge "Add <staging-public-group> tags to T" into sc-v2-dev-plus-aosp am: 83972563 -s ours

am skip reason: Merged-In Ia7835d04d988127d061d3a454b8391294346a915 with SHA-1 6c782479 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16708463

Change-Id: I9e042c0ed1ba46faee513bf010ec5ce2019f5876