Merge "Added android.service.contentcapture.ActivityEvent.TYPE_ACTIVITY_STOPPED"