Merge "Avoid NPE in system_server in bringDownServiceLocked()"