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

Change-Id: I7a5014b2c18dba503d4883b4134db3e1f6c6b6f5