Merge "Add 5G stats to Phone info menu" am: d4b768f672 am: 390cb068a8

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

Change-Id: Id28d9774e261295ff10a6afa977d73b1e6447ec7