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

[automerger skipped] Merge "Stop using invalid URL to prevent unexpected crash" into sc-dev am: bc162dd7 -s ours am: dbd27fcd -s ours am: 680620a6 -s ours am: 6306f985 -s ours am: 510f3610 -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/+/18714947



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