Merge "Make ACTION_USER_REMOVED intent a SystemApi." into oc-dev