Merge "Collect user modified apn metrics" into tm-dev am: 0415c5b2

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



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