Merge "DND apps might not have a service, and that's ok" into oc-mr1-dev am: 098dae1b3e
am: 1f8c8eab29

Change-Id: Iee46c170f074dfb3309ac42718fab66022f59239