Merge "RadioInfo network mode list and network mode string add 5G"
am: 522abc6fc1

Change-Id: Ic5a4f7ef9e133d9f4f2c8b4d0331924e2a636edb