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

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

Change-Id: Id4a840f64e04228de024ee755edb0a1e51466edc