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

Change-Id: Ic7573a7162299502beae0e1a11e6b41fa9bf4371