Merge "Don't assume host is wildcard if not provided" into rvc-dev am: a1b6280ec8 am: 8f65482603 am: 8b9e0911d0 am: 5954d91e0d

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

Change-Id: I53913826ec0b6cacf2aeb268a925c3d706e02298