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: I3da046c76edf28998e4a9660ddaf514759a5e174
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>