[automerger skipped] Merge "Add 5G stats to Phone info menu" am: d4b768f672 am: 390cb068a8 am: 3843d937e0 -s ours am: 6edd5a4158 -s ours

am skip reason: Change-Id I1daa0ef277fec3cf40af77480853d850d43ba826 with SHA-1 728961046f is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1371196

Change-Id: I38c7220b6092523337b5f276a255862ded37f1f5