Merge "Rebind ContentCaptureService when the binderDied." into sc-v2-dev am: 159b8a504a am: 6510e4fcd2

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

Change-Id: I0c46d75f2f03f87e0532e7d0ae9cf195df4a5471