[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: 47ea8c50 -s ours am: b72eb3dc -s ours am: bcbaeaab -s ours am: 60ea9aa1 -s ours am: e6ac6309 -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: If9e29382a68a6ee2ffe2d52f9dbbbc06e48a946b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>