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: eeaaec44 am: 55d9cf8e

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



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