Mitigate VoNR/EPSFB metrics issue in T QPR3 am: 33e9c4fe am: e7969714 am: 2e4ee45a

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



Change-Id: I0b874b70d7dea69a70c22089b81e7b24fe7e52b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>