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

Change-Id: Ie86c30d925119f4ebfdb420ff0093d508e8274cb