[automerger skipped] Merge "Add NR Global to the logic to check if it is...

[automerger skipped] Merge "Add NR Global to the logic to check if it is Global" am: 64c40305 am: 9a5a1eab -s ours am: c753471a -s ours am: f9aea105 -s ours

am skip reason: Change-Id I4d84c6669d6385bef5d75fca4cd6f2ff17533b6e with SHA-1 ff11f200 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393367

Change-Id: If8d71349cd40c8c8f0490a8ea0c2bda429ea1304