Merge "close a potential race condition in registerAsSystemService" into nyc-dev
am: 3b016f5445

* commit '3b016f544502dca8c162554c6ea42bd6727f4cde':
  close a potential race condition in registerAsSystemService

Change-Id: I925edd07ead39be9ec34c013ad00d34f0d600c06