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

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



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