Merge "Fix CellSignalStrengthNr to use SS-RSRP" am: ce698c4ab2
am: 2f0294d38e

Change-Id: Ica8d0d7845864e62607abd34a50d429f55e0bffc