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 am: 627a8883
Change-Id: Ic40ce5f170373e031caf178e5e6acbbb3866433c