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

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

Change-Id: Id40de1c593f0241617831621840a344ab674075f