Merge "servicemanager: avoid segfault on null manifest." am: e4d836a41f
am: 6a52945988

Change-Id: I934adcabb1d4f8b2c81b0507f7977e360c7c183c