[automerger skipped] Merge "Remove key from database if download URL is not...

[automerger skipped] Merge "Remove key from database if download URL is not set" am: b30e0b4c am: 64b76eaa -s ours

am skip reason: Change-Id Ieb7078af4be07edd1ca287c01cec6e2652fb3bf8 with SHA-1 0803ae31 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1556390

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b364ad2bc0a15a1521e62a50b22f6e3f9deb344