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

Change-Id: Iae7098ce19b7710d47039e1be6f3314fcf8a5257