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

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

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

Change-Id: I5577208cf0fbbd3d60c30f574b8028bc1998e6f3