Merge "Stop using invalid URL to prevent unexpected crash" into tm-dev am:...

Merge "Stop using invalid URL to prevent unexpected crash" into tm-dev am: 25f2e584 am: e1c11851 am: 40f66650

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



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