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

Change-Id: I76faa08f32a5944429a6db854e01435b44eb1f34