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

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



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