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

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

Change-Id: Ie9fde666d6f06690ec56692a62b29d7f2a9394c5