[automerger skipped] Merge "Stop using invalid URL to prevent unexpected...

[automerger skipped] Merge "Stop using invalid URL to prevent unexpected crash" into qt-dev am: 3ac8d1dc am: dadbab8a am: 14f1bec4 am: 96f4ca0f -s ours

am skip reason: Merged-In I22903414380b62051f514e43b93af992f45740b4 with SHA-1 fe57c5bf is already in history

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



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