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: bfa96378

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



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