Merge "Avoid NPE in system_server in bringDownServiceLocked()"
am: 967232eef3

Change-Id: I6ddb38104769ec9e9448c32f55046bc05c709fff