Merge "Fix defaultServiceManager() locking and retry loop." am: b1e64b4873 am: 29d636cd3f

Change-Id: Ib7aaf892cf1fd7a140165db5575b9c39400f6971