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

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

Change-Id: I40b2686a3a5065120891dd2e3488bfac02cb07cd