[automerger skipped] Merge "Add Setting for NR screen off indications" am: b12ae89571 am: cdde89f06d -s ours

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

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

Change-Id: I5188310bfbe038427535aab9269731747a79424d