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

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

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

Change-Id: I58da8bb585b343c0e018352c8afa2affbae0a6da