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

Change-Id: I311e10a4d9406539dfa7c540476b1bf86ebdad8c