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

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



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