[automerger skipped] Merge "Add RCS metrics of sipDelegate/sipDelegateFeatureTags" into sc-v2-dev am: 05d68a2109 am: 4d5d0d4c51 -s ours

am skip reason: Merged-In I69bbae4b3d536f5da37362b1867f4488c43a49f2 with SHA-1 ffa7de13ff is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/16264343

Change-Id: I76f733cf340e45db7f4e8fd7cac1e2a54637a89d