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

Change-Id: I3f6f0f0c125c0c514714b38b24fbb83e935d33d0