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

Change-Id: Ia99ee7e63e6b8eb5c6b2acb110b93249e84be210