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 am: a4fcf6aa
Change-Id: Ice658c66259736c1231b9d4bd60350c58114c11b