[automerger skipped] Merge "Add <staging-public-group> tags to T" am: 423e45e1 am: fcbe66c5 am: 77c70517 -s ours

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

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

Change-Id: Iaeaad568e1f1cbe2cca1403d4d9ebcdf186b3958