Merge "Add <staging-public-group> tags to T" am: 423e45e117

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

Change-Id: Ib76535e3e15db04821eae85b3c7ee0671190baaa