tree 5807313a337a51eb3db65257675ba698c0305fae
parent 13f6f775697f95f09a742ded87db450b9858fd73
parent 3279219a5a0e46462b8b5dcfdee269586b2a0ca3
author Paul Hu <paulhu@google.com> 1638856875 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638856875 +0000

Merge "Stop using NSD_ON setting" am: a37333ace6

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

Change-Id: I13cc751269756ba745f4327b35e3562e3aefd689