[automerger skipped] Merge "Add Setting for NR screen off indications" am:...

[automerger skipped] Merge "Add Setting for NR screen off indications" am: b12ae895 am: cdde89f0 -s ours am: 1b90a57e -s ours am: 74c0253b -s ours am: 6432d408 -s ours

am skip reason: Change-Id Ifa485230f6d27eaa7a665a396e3eac33e00feadb with SHA-1 6c283739 is in history

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

Change-Id: I0d28cff787fed7d73b84be0d33094a5b81b4dc17