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 am: 7ecb76d1 am: a81ebecb
Change-Id: Iabdd5e128c60a7cfbccffcf937ef903f68555b95