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

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

Change-Id: I3d39e2e847f14d2d077240b52fb05b268fd1922c