Merge "Add the activity used in deferred setup provisioning flow" into udc-dev