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

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

Change-Id: I79033b1a9f2dd43f9854ffd48910a35509be1a48