Merge "Fix cookie logic for webviews" into udc-qpr-dev am: d3813b18

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23884108



Change-Id: Idc4bdf5928e620a6fb8bbbaf03f99203c480fe3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>