Merge "Fix SystemCaptionsManagerService to re-bind after a force stop" into rvc-qpr-dev am: 2f4d456c2c

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

Change-Id: I399b0c3961be731947c50d26b9a31c1db6c268cd