Merge "Moved common Content Capture helpers to com.android.compatibility.common.util"