Merge "Merge "Don't assume host is wildcard if not provided" into rvc-dev am:...

Merge "Merge "Don't assume host is wildcard if not provided" into rvc-dev am: a1b6280e am: d856d8e3" into rvc-d1-dev-plus-aosp am: 89fe7de2

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

Change-Id: I90aecb4d9eb3c86b85e13fd992606b4414d6de79