Merge "Revert "Rebind ContentCaptureService when the binderDied."" into tm-dev am: aa6bb0ad am: 8056053b

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



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