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 am: b0b2c408
Change-Id: I88a4228cbd7a584e16d44275accb73cc2085e62d