Merge "Stop using invalid URL to prevent unexpected crash" into tm-dev am:...

Merge "Stop using invalid URL to prevent unexpected crash" into tm-dev am: 25f2e584 am: eeaaec44

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



Change-Id: I52a2fa52410a93142e8069d16a6b0f8792af4e20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>