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