Merge "Fixed whitelistManager set on unbindServiceLocked()" into nyc-dev