Merge "Remove NSD_ON setting" am: 02124fb14f am: 06a06836ae am: c7ec38668e

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

Change-Id: Ib949305720f0ee409cf3b47bf12f0a364115451d