Merge "NotificationAssistantService(NAS) is not set on a freshly setup device"...
Merge "NotificationAssistantService(NAS) is not set on a freshly setup device" into rvc-dev am: 1970e8d2 am: 46618712
Change-Id: Id57b8bb5b3c0d4313305d84c58c82eeaff1f9b02