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: 39f9a3a2 am: adedfa30
Change-Id: I6fb61fd06bdb1b197d5c6a48433716859a7351d7