am aa2a5911: Merge "Update CookieManager API for Council review." into lmp-dev

* commit 'aa2a591149af6c904adb780ac539194a0b9893a0':
  Update CookieManager API for Council review.