Merge "Fix CellSignalStrengthNr to use SS-RSRP"