Merge "Stop using NSD_ON setting" am: a37333ace6 am: db85fcfbbd

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

Change-Id: Ia8c7d78da0b1ad007f25935dafa0673d04118367