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

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



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