[automerger skipped] Merge changes from topic "metrics_datastack" am:...

[automerger skipped] Merge changes from topic "metrics_datastack" am: c1eeb4e1 am: dd9f89c9 am: 27766363 -s ours am: 7eada48a -s ours

am skip reason: Merged-In I6119d3efdffcc5e2cf3eefe71a52261d0ea8f0f5 with SHA-1 eed03c14 is already in history

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



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