Merge "Fixed Content Capture workflow when service package is updated."

diff --cc core/java/android/service/contentcapture/ContentCaptureService.java
Simple merge

diff --cc services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java
Simple merge

diff --cc services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java
Simple merge