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

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

Change-Id: Ia269346654746ebb527c589a43bf5c21fc605f52