Merge "Merge "Stop using invalid URL to prevent unexpected crash" into tm-dev am: 25f2e584 am: e1c11851" into tm-d1-dev-plus-aosp am: 0eab1422

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



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