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: f7c07739
Change-Id: Id12bfff6042defe33f24aab1d50565913ed9f9c1