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

Change-Id: I0f4a5920e05f6430b9c76a30ff6c0094f8145c74