am c7b57a32: Merge "Nullpointer check on mAdapterService in ProfileService#onCreate" into lmp-mr1-dev

* commit 'c7b57a322ddf96f5c7f5398a36f72700dc0081da':
  Nullpointer check on mAdapterService in ProfileService#onCreate