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

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