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

Change-Id: I899e717ec924ab5f7b4362704704c36817613eb8