Fix bug: NAS set to none will be reset to default after the second
reboot

Bug: 185725135
Test: atest NotificationAssistantsTest, ManagedServicesTest,
NotificationManagedServiceTest

Change-Id: I63ba2a4e6fc1e9ac4612231af25c55fb66b0991e
4 files changed