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: 8e404e10 am: 650b1ca7 am: e3dc99e7

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



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