[automerger skipped] Merge "Add metrics for AutoDataSwitch" into...

[automerger skipped] Merge "Add metrics for AutoDataSwitch" into tm-qpr-dev-plus-aosp am: f8a39d28 -s ours

am skip reason: Merged-In If8342b9150d56546c85c1a9ad255f4d17c5c04bc with SHA-1 f30be7ee is already in history

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



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