Merge "Type check before casting from CookieHandler to CookieManager" into oc-dr1-dev
am: 925abb706e

Change-Id: I50b447cc5aa86dc32787ff6dc0d5f71e3c042367