Merge "Merge "Merge "Don't assume host is wildcard if not provided" into...

Merge "Merge "Merge "Don't assume host is wildcard if not provided" into rvc-dev am: a1b6280e am: d856d8e3" into rvc-d1-dev-plus-aosp am: 89fe7de2" into rvc-qpr-dev-plus-aosp am: b48a5337

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

Change-Id: I6b16aee54e9bd76f372114ebec8a07305367f33d