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

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

Change-Id: Ic60404a9aa17c5446fb3fd5034b0d2366dc9449c