Merge "Merge "Add corresponding code for the new NR condition" into rvc-dev...
Merge "Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd2 am: baad4770" into rvc-d1-dev-plus-aosp am: 7c5eed98
Change-Id: I85aeb033ea77eb4f8d2ecf75c73972b0146c3e90