[automerger skipped] Reconnect if weaver service connection dies am: 5f8125f572 am: 1a97a06c34 -s ours am: f07e1fdd6e -s ours am: 732c2db21d -s ours

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

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

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