[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: 13d99831 -s ours am: 05581352 -s ours am: 76e31b13 -s ours am: 0cfe0dad -s ours am: 82330803 -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: I8e32e5bc3f7fe6497f32a85317bd990f7da4d8fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>