Merge "[Partner request] Remove https and trailing slash in an https origin"...

Merge "[Partner request] Remove https and trailing slash in an https origin" into udc-dev am: f90961ff am: 18570c5f am: b64f6dcd

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



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