Merge \\\"Fixed whitelistManager set on unbindServiceLocked()\\\" into nyc-dev am: 8d78c33c9b am: ef5c3aad4d
am: cb9c52fd80

Change-Id: I17e1697ced6f5c44e47f85245b637c82880e27d3