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: 8f654826 am: 8b9e0911

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

Change-Id: I2e6ccd502c0c4cda7f583c08868c74ec86304464