Merge "Revert "Rebind ContentCaptureService when the binderDied."" into tm-dev am: aa6bb0ad am: 94e6aba3 am: 86c3009d am: e3ffffe3

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



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