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

Change-Id: I0339e6ae9261b1ebdd7bbed54540ca253b1b6fd9