[automerger skipped] Merge "Fix VoiceCallSessionStatsTest" into tm-qpr-dev am: 0a57f9f4 -s ours

am skip reason: Merged-In If2b03265927d57bd42213feee1c56c8c13581a40 with SHA-1 d25e857d is already in history

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



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