Merge "Add 5G cellInfo & signal strength" am: 7ac99ae365
am: e2d75f8b22

Change-Id: I00e29e366c7bd75c394ad87eac1b691f335a4bb0