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

Change-Id: I41a01b160cc2456a242526daa38dc07d79339a6c