[automerger skipped] Reconnect if weaver service connection dies am: 59a58494d9 am: 7281f66171 -s ours am: b1e9426eb4 -s ours

am skip reason: Merged-In Ic06c45353c6b7282e2f22eef13ea1c6e36fe5c58 with SHA-1 b4674166a9 is already in history

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

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