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

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



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