[automerger skipped] Merge "Add dump reset for rcs metrics" into sc-v2-dev am:...

[automerger skipped] Merge "Add dump reset for rcs metrics" into sc-v2-dev am: 04b57e4d am: 519a4563 -s ours

am skip reason: Merged-In Ia818d7a515a742ba8f0afb800a84ad26fafc64ee with SHA-1 1ca50849 is already in history

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

Change-Id: I18ef9ac3a98e5b69ff37ec7ada33f77c59b8b435