Merge "Add Nullable to MediaHTTPService's mCookies." am: 7955aec0ea
am: 293800c9c9

Change-Id: I979f9ce803fd69059683cb2be5104e9a5fa96e96