[automerger skipped] Merge "Add RCS metrics for GBA event" into sc-v2-dev am:...

[automerger skipped] Merge "Add RCS metrics for GBA event" into sc-v2-dev am: 4b637688 am: 8f284dff -s ours

am skip reason: Merged-In I823c1681d7242fbf29ecbf77679f177414c589ed with SHA-1 a8bb8e93 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/16278718

Change-Id: I1c8798d937b09b08f321f7b60081d74e4fa03ab7