Merge "Add NR to global mode" into sc-qpr1-dev am: 21cb293e88 am: 958235b40e am: a86772a354

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15801503

Change-Id: Iee3aae437c227036d869d335d4fcb951bf9fb9ec