Merge "Enable default NAS for users who haven't done NAS migration" into sc-v2-dev am: 53065f930b am: 636522459c

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

Change-Id: I15a5a21e739486099c5d9b92e267052529ef157f