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

Change-Id: I20a708d026bb140198ca43987143d6013c6224fc