Merge "NR is lower priority than all other signal strengths" into rvc-dev am: 2939486f37

Change-Id: I28343ff22d88d207e7a64b8d6525e91d3692653c