Merge "[DLC vNext] Replace wipeData with wipeDevice to comply with Android U" into udc-devicelock-prod