This seems like an oversight when system_server_startup was introduced (commit caf42d615d). Test: Presubmits Change-Id: Ia371caa8dfc2c250d6ca6f571cf002e25703e793
caf42d615d