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

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

Change-Id: Ie5030be0f902ebe32b3b84676a6dc3cdcd2a98af