Merge "Stop using NSD_ON setting" am: a37333ace6

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

Change-Id: I13cc751269756ba745f4327b35e3562e3aefd689
tree: 5807313a337a51eb3db65257675ba698c0305fae
  1. core/
  2. packages/
  3. services/