Merge "Call markBootAttempt when serice manager available" am: 8e842dd365
am: e0a5a58bed

Change-Id: Ia3a0846ab5206147159ccf6f734864a40e5c1364